auto merge of #679 : alexcrichton/cargo/fix-doc-test, r=brson
authorbors <bors@rust-lang.org>
Tue, 7 Oct 2014 20:29:59 +0000 (20:29 +0000)
committerbors <bors@rust-lang.org>
Tue, 7 Oct 2014 20:29:59 +0000 (20:29 +0000)

Trivial merge